projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31afc7d 135fd91)
bitkeeper revision 1.1184 (420ce06eLX3IXXYgfWOdCOQZS6HoDg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Fri, 11 Feb 2005 16:42:22 +0000 (16:42 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Fri, 11 Feb 2005 16:42:22 +0000 (16:42 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/x86/x86_32/entry.S patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/x86/x86_32/entry.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.